Add a gtkbindingsprivate.h header

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index b1226b1632b36d11ea67a5a3ccfea9f300dec790..f4dfbe4baf8683188c4c6b1a98d3d738caa8889b 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -380,6 +380,7 @@ gtk_private_h_sources =             \
        gtkappchooserprivate.h  \
        gtkappchoosermodule.h   \
        gtkappchooseronline.h   \
+       gtkbindingsprivate.h    \
        gtkbuilderprivate.h     \
        gtkbuttonprivate.h      \
        gtkcellareaboxcontextprivate.h  \

diff --git a/gtk/gtkbindings.c b/gtk/gtkbindings.c
index ef31fb97461f7c27cc7acfd2983aa4f258d010e0..f6e56862a0d0005a96eb2971008220b341daa4f3 100644 (file)
--- a/gtk/gtkbindings.c
+++ b/gtk/gtkbindings.c
@@ -24,14 +24,14 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
 #include "config.h"
 #include <string.h>
 #include <stdarg.h>
 
-#include "gtkbindings.h"
+#include "gtkbindingsprivate.h"
 #include "gtkkeyhash.h"
 #include "gtkwidget.h"
 #include "gtkrc.h"
@@ -241,7 +241,7 @@ binding_entry_new (GtkBindingSet  *binding_set,
       GtkKeyHash *key_hash = tmp_list->data;
       binding_key_hash_insert_entry (key_hash, entry);
     }
-  
+
   return entry;
 }
 

diff --git a/gtk/gtkbindings.h b/gtk/gtkbindings.h
index cf7f6bfb145fcf4e48eeb9aebfb2c7730e13c495..4342d15298609da0cd1630edaf64e8451ecbdb2a 100644 (file)
--- a/gtk/gtkbindings.h
+++ b/gtk/gtkbindings.h
@@ -11,7 +11,7 @@
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
@@ -40,113 +40,97 @@
 
 G_BEGIN_DECLS
 
-
-/* Binding sets
- */
-
-typedef struct _GtkBindingSet          GtkBindingSet;
-typedef struct _GtkBindingEntry                GtkBindingEntry;
-typedef struct _GtkBindingSignal       GtkBindingSignal;
-typedef struct _GtkBindingArg          GtkBindingArg;
+typedef struct _GtkBindingSet    GtkBindingSet;
+typedef struct _GtkBindingEntry  GtkBindingEntry;
+typedef struct _GtkBindingSignal GtkBindingSignal;
+typedef struct _GtkBindingArg    GtkBindingArg;
 
 struct _GtkBindingSet
 {
-  gchar                        *set_name;
-  gint                  priority;
-  GSList               *widget_path_pspecs;
-  GSList               *widget_class_pspecs;
-  GSList               *class_branch_pspecs;
-  GtkBindingEntry      *entries;
-  GtkBindingEntry      *current;
-  guint                  parsed : 1; /* From RC content */
+  gchar           *set_name;
+  gint             priority;
+  GSList          *widget_path_pspecs;
+  GSList          *widget_class_pspecs;
+  GSList          *class_branch_pspecs;
+  GtkBindingEntry *entries;
+  GtkBindingEntry *current;
+  guint            parsed : 1;
 };
 
 struct _GtkBindingEntry
 {
-  /* key portion
-   */
-  guint                         keyval;
-  GdkModifierType       modifiers;
-  
-  GtkBindingSet                *binding_set;
-  guint                        destroyed : 1;
-  guint                        in_emission : 1;
-  guint                 marks_unbound : 1;
-  GtkBindingEntry      *set_next;
-  GtkBindingEntry      *hash_next;
-  GtkBindingSignal     *signals;
+  /* key portion */
+  guint             keyval;
+  GdkModifierType   modifiers;
+
+  GtkBindingSet    *binding_set;
+  guint             destroyed     : 1;
+  guint             in_emission   : 1;
+  guint             marks_unbound : 1;
+  GtkBindingEntry  *set_next;
+  GtkBindingEntry  *hash_next;
+  GtkBindingSignal *signals;
 };
 
 struct _GtkBindingArg
 {
-  GType                 arg_type;
+  GType      arg_type;
   union {
-    glong       long_data;
-    gdouble     double_data;
-    gchar      *string_data;
+    glong    long_data;
+    gdouble  double_data;
+    gchar   *string_data;
   } d;
 };
 
 struct _GtkBindingSignal
 {
-  GtkBindingSignal     *next;
-  gchar                *signal_name;
-  guint                         n_args;
-  GtkBindingArg                *args;
+  GtkBindingSignal *next;
+  gchar            *signal_name;
+  guint             n_args;
+  GtkBindingArg    *args;
 };
 
-/* Application-level methods */
-
-GtkBindingSet* gtk_binding_set_new     (const gchar    *set_name);
-GtkBindingSet* gtk_binding_set_by_class(gpointer        object_class);
-GtkBindingSet* gtk_binding_set_find    (const gchar    *set_name);
-gboolean gtk_bindings_activate         (GObject        *object,
-                                        guint           keyval,
-                                        GdkModifierType modifiers);
-gboolean gtk_bindings_activate_event    (GObject        *object,
-                                        GdkEventKey    *event);
-gboolean gtk_binding_set_activate      (GtkBindingSet  *binding_set,
-                                        guint           keyval,
-                                        GdkModifierType modifiers,
-                                        GObject        *object);
-
-void    gtk_binding_entry_skip         (GtkBindingSet  *binding_set,
-                                         guint           keyval,
-                                         GdkModifierType modifiers);
-void    gtk_binding_entry_add_signal   (GtkBindingSet  *binding_set,
-                                         guint           keyval,
-                                         GdkModifierType modifiers,
-                                         const gchar    *signal_name,
-                                         guint           n_args,
-                                         ...);
-void    gtk_binding_entry_add_signall  (GtkBindingSet  *binding_set,
-                                        guint           keyval,
-                                        GdkModifierType modifiers,
-                                        const gchar    *signal_name,
-                                        GSList         *binding_args);
-
-GTokenType gtk_binding_entry_add_signal_from_string (GtkBindingSet *binding_set,
-                                                     const gchar   *signal_desc);
-
-void    gtk_binding_entry_remove       (GtkBindingSet  *binding_set,
-                                        guint           keyval,
-                                        GdkModifierType modifiers);
-
-void    gtk_binding_set_add_path       (GtkBindingSet  *binding_set,
-                                        GtkPathType     path_type,
-                                        const gchar    *path_pattern,
-                                        GtkPathPriorityType priority);
-
-
-/* Non-public methods */
-
-guint   _gtk_binding_parse_binding     (GScanner       *scanner);
-void     _gtk_binding_reset_parsed      (void);
-void    _gtk_binding_entry_add_signall (GtkBindingSet  *binding_set,
-                                        guint           keyval,
-                                        GdkModifierType modifiers,
-                                        const gchar    *signal_name,
-                                        GSList         *binding_args);
+GtkBindingSet *gtk_binding_set_new           (const gchar         *set_name);
+GtkBindingSet *gtk_binding_set_by_class      (gpointer             object_class);
+GtkBindingSet *gtk_binding_set_find          (const gchar         *set_name);
+
+gboolean       gtk_bindings_activate         (GObject             *object,
+                                              guint                keyval,
+                                              GdkModifierType      modifiers);
+gboolean       gtk_bindings_activate_event   (GObject             *object,
+                                              GdkEventKey         *event);
+gboolean       gtk_binding_set_activate      (GtkBindingSet       *binding_set,
+                                              guint                keyval,
+                                              GdkModifierType      modifiers,
+                                              GObject             *object);
+
+void           gtk_binding_entry_skip        (GtkBindingSet       *binding_set,
+                                              guint                keyval,
+                                              GdkModifierType      modifiers);
+void           gtk_binding_entry_add_signal  (GtkBindingSet       *binding_set,
+                                              guint                keyval,
+                                              GdkModifierType      modifiers,
+                                              const gchar         *signal_name,
+                                              guint                n_args,
+                                              ...);
+void           gtk_binding_entry_add_signall (GtkBindingSet       *binding_set,
+                                              guint                keyval,
+                                              GdkModifierType      modifiers,
+                                              const gchar         *signal_name,
+                                              GSList              *binding_args);
+
+GTokenType     gtk_binding_entry_add_signal_from_string
+                                             (GtkBindingSet       *binding_set,
+                                              const gchar         *signal_desc);
+
+void           gtk_binding_entry_remove      (GtkBindingSet       *binding_set,
+                                              guint                keyval,
+                                              GdkModifierType      modifiers);
+
+void           gtk_binding_set_add_path      (GtkBindingSet       *binding_set,
+                                              GtkPathType          path_type,
+                                              const gchar         *path_pattern,
+                                              GtkPathPriorityType  priority);
 
 G_END_DECLS
 

diff --git a/gtk/gtkbindingsprivate.h b/gtk/gtkbindingsprivate.h
new file mode 100644 (file)
index 0000000..e9057f5
--- /dev/null
+++ b/gtk/gtkbindingsprivate.h
@@ -0,0 +1,37 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GTK_BINDINGS_PRIVATE_H__
+#define __GTK_BINDINGS_PRIVATE_H__
+
+#include "gtkbindings.h"
+
+G_BEGIN_DECLS
+
+guint _gtk_binding_parse_binding     (GScanner        *scanner);
+void  _gtk_binding_reset_parsed      (void);
+void  _gtk_binding_entry_add_signall (GtkBindingSet   *binding_set,
+                                      guint            keyval,
+                                      GdkModifierType  modifiers,
+                                      const gchar     *signal_name,
+                                      GSList          *binding_args);
+
+G_END_DECLS
+
+#endif /* __GTK_BINDINGS_PRIVATE_H__ */